gnomeos: Install libuuid and libblkid

So NetworkManager can use them.

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 133a2c897cb9054ad143a452f378509eae547e67..fd04d957328ce37349eeb61607c3545b857ef622 100644 (file)
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit rootfs_${IMAGE_PKGTYPE}
 
-IMAGE_INSTALL = ""
+IMAGE_INSTALL = "libuuid1 libblkid1"
 
 RECIPE_PACKAGES = "task-core-boot \
                   coreutils \
@@ -60,9 +60,19 @@ sysfs                   /sys                    sysfs   defaults        0 0
 proc                    /proc                   proc    defaults        0 0
 EOF
 
+       # Kill the Debian netbase stuff - we use NetworkManager
+       rm -rf ${IMAGE_ROOTFS}/etc/network
+       rm -f ${IMAGE_ROOTFS}/etc/init.d/networking
 
        ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
 
+       # Override base-passwd...it has lots of crap in it we don't
+       # want, and we do want dbus.
+       cat >${IMAGE_ROOTFS}/var/passwd << EOF
+root::0:0:root:/:/bin/sh
+dbus:*:1:1:dbus:/:/bin/false
+EOF
+
        TOPROOT_BIND_MOUNTS="home root tmp"
        OSTREE_BIND_MOUNTS="var"
        OSDIRS="dev proc mnt media sys sysroot"